Skip to content

Pulling hotfixes down into develop #1257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Apr 8, 2025
Merged

Pulling hotfixes down into develop #1257

merged 15 commits into from
Apr 8, 2025

Conversation

JoshuaVulcan
Copy link
Collaborator

See title

test('selects a new time zone', () => {
renderTimeZoneSelect();
// @ TODO: Fix this test
// test('selects a new time zone', () => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we agreed on not commenting this test, but just removing the failing part of it:

expect(setTimeOfDayTimeZone).toHaveBeenCalledWith('America/Guadeloupe');

The test is still useful to make sure the callback is triggered, we just can't tell exactly which timezone will be.

Copy link
Collaborator Author

@JoshuaVulcan JoshuaVulcan Apr 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I'll fix this directly in develop.

return `${src}:${w}:${h}`;
};

export const imgElFromSrc = (src, baseUnit = null) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm I still see some of the confusing variable names I suggested to change in the feedback of the hotfix PR: w, h, imgElFromSrc

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hotfixes are urgent code repairs, and I think it's a reasonable perspective to take on general feedback/code improvements separately from hotfixes -- especially for long-lived existing code like this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Totally agreed. I think what I mean is not to improve old code like we do with new PRs (boyscout rule). But I notice new code being added as part of the fix, and I would argue that the new code should come with the high standards we have.

That said, given the urgency and the fact that indeed the code of this file is too old and could take a big refactor, I wouldn't block this.

@JoshuaVulcan JoshuaVulcan merged commit 98d01c9 into develop Apr 8, 2025
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants